Add show-popup and hide-popup signals and emit them when the popup is

2005-11-10  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcombobox.c: Add show-popup and hide-popup signals and
	emit them when the popup is shown or hidden.  (#162531, Tommi
	Komulainen)

diff --git a/ChangeLog b/ChangeLog
index a25cde0e693454e546db12798863a793e44674bc..e68539e17292b5ca360d9f1e7e6bc3e9d09a8f04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-11-10  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcombobox.c: Add show-popup and hide-popup signals and
+       emit them when the popup is shown or hidden.  (#162531, Tommi
+       Komulainen)
+
+       * tests/testcombo.c: Add an example of popuplating a combobox
+       on click.
+
        * gtk/gtktreeview.c (gtk_tree_view_motion_resize_column): Another
        erroneous semicolon.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a25cde0e693454e546db12798863a793e44674bc..e68539e17292b5ca360d9f1e7e6bc3e9d09a8f04 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,12 @@
 2005-11-10  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcombobox.c: Add show-popup and hide-popup signals and
+       emit them when the popup is shown or hidden.  (#162531, Tommi
+       Komulainen)
+
+       * tests/testcombo.c: Add an example of popuplating a combobox
+       on click.
+
        * gtk/gtktreeview.c (gtk_tree_view_motion_resize_column): Another
        erroneous semicolon.
 

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index d6ae05a40b3bf4edcae20cd0b3a7f3a49c284e84..4be906aadba36cda4c7df3c315c1c6f4fac906ad 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -183,6 +183,8 @@ struct _GtkComboBoxPrivate
 
 enum {
   CHANGED,
+  POPUP_SHOW,
+  POPUP_HIDE,
   LAST_SIGNAL
 };
 
@@ -205,6 +207,7 @@ static guint combo_box_signals[LAST_SIGNAL] = {0,};
 #define SCROLL_TIME  100
 
 /* common */
+
 static void     gtk_combo_box_class_init           (GtkComboBoxClass *klass);
 static void     gtk_combo_box_cell_layout_init     (GtkCellLayoutIface *iface);
 static void     gtk_combo_box_cell_editable_init   (GtkCellEditableIface *iface);
@@ -421,6 +424,11 @@ static void     combo_cell_data_func                         (GtkCellLayout   *c
                                                              GtkTreeModel    *tree_model,
                                                              GtkTreeIter     *iter,
                                                              gpointer         data);
+static void     gtk_combo_box_child_show                     (GtkWidget       *widget,
+                                                             gpointer         user_data);
+static void     gtk_combo_box_child_hide                     (GtkWidget       *widget,
+                                                             gpointer         user_data);
+
 
 /* GtkCellEditable method implementations */
 static void gtk_combo_box_start_editing (GtkCellEditable *cell_editable,
@@ -538,6 +546,25 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
                   g_cclosure_marshal_VOID__VOID,
                   G_TYPE_NONE, 0);
 
+  combo_box_signals[POPUP_SHOW] =
+    g_signal_new ("popup-show",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_LAST,
+                  NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  combo_box_signals[POPUP_HIDE] =
+    g_signal_new ("popup-hide",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_LAST,
+                  NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+
   /* properties */
   /**
    * GtkComboBox:model:
@@ -1056,6 +1083,8 @@ gtk_combo_box_menu_show (GtkWidget *menu,
 {
   GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
 
+  gtk_combo_box_child_show (menu, user_data);
+
   combo_box->priv->popup_in_progress = TRUE;
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo_box->priv->button),
                                 TRUE);
@@ -1068,6 +1097,8 @@ gtk_combo_box_menu_hide (GtkWidget *menu,
 {
   GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
 
+  gtk_combo_box_child_hide(menu,user_data);
+
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo_box->priv->button),
                                 FALSE);
 }
@@ -1143,6 +1174,13 @@ gtk_combo_box_set_popup_widget (GtkComboBox *combo_box,
          
           combo_box->priv->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
 
+         g_signal_connect (GTK_WINDOW(combo_box->priv->popup_window),"show",
+                           G_CALLBACK (gtk_combo_box_child_show),
+                           combo_box);
+         g_signal_connect (GTK_WINDOW(combo_box->priv->popup_window),"hide",
+                           G_CALLBACK (gtk_combo_box_child_hide),
+                           combo_box);
+         
          toplevel = gtk_widget_get_toplevel (GTK_WIDGET (combo_box));
          if (GTK_IS_WINDOW (toplevel))
            gtk_window_group_add_window (_gtk_window_get_group (GTK_WINDOW (toplevel)), 
@@ -2084,6 +2122,24 @@ gtk_combo_box_forall (GtkContainer *container,
     (* callback) (GTK_BIN (container)->child, callback_data);
 }
 
+static void 
+gtk_combo_box_child_show (GtkWidget *widget,
+                         gpointer   user_data) 
+{
+  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
+
+  g_signal_emit_by_name (combo_box, "popup-show", NULL, NULL);    
+}
+
+static void 
+gtk_combo_box_child_hide (GtkWidget *widget,
+                         gpointer   user_data)
+{
+  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);  
+
+  g_signal_emit_by_name (combo_box, "popup-hide", NULL, NULL);
+}
+
 static gboolean
 gtk_combo_box_expose_event (GtkWidget      *widget,
                             GdkEventExpose *event)
@@ -3314,6 +3370,19 @@ gtk_combo_box_list_destroy (GtkComboBox *combo_box)
                                         0, 0, NULL,
                                         gtk_combo_box_list_button_released,
                                         NULL);
+
+  g_signal_handlers_disconnect_matched (combo_box->priv->popup_window,
+                                       G_SIGNAL_MATCH_DATA,
+                                       0, 0, NULL, 
+                                       gtk_combo_box_child_show,
+                                       NULL);
+
+  g_signal_handlers_disconnect_matched (combo_box->priv->popup_window,
+                                       G_SIGNAL_MATCH_DATA,
+                                       0, 0, NULL, 
+                                       gtk_combo_box_child_hide,
+                                       NULL);
+  
   if (combo_box->priv->box)
     g_signal_handlers_disconnect_matched (combo_box->priv->box,
                                          G_SIGNAL_MATCH_DATA,

diff --git a/tests/testcombo.c b/tests/testcombo.c
index ea6f5133659ec316c14d6d5d5fdc164460fb332a..ba753420724d4a0ef0936807c489b840c7caf470 100644 (file)
--- a/tests/testcombo.c
+++ b/tests/testcombo.c
@@ -206,6 +206,90 @@ create_tree_blaat (void)
         return GTK_TREE_MODEL (store);
 }
 
+static GtkTreeModel *
+create_empty_list_blaat (void)
+{
+        GdkPixbuf *pixbuf;
+        GtkWidget *cellview;
+        GtkTreeIter iter;
+        GtkListStore *store;
+
+        cellview = gtk_cell_view_new ();
+
+        store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
+
+        pixbuf = gtk_widget_render_icon (cellview, GTK_STOCK_DIALOG_WARNING,
+                                         GTK_ICON_SIZE_BUTTON, NULL);
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                            0, pixbuf,
+                            1, "gtk-stock-dialog-warning",
+                            -1);
+
+        gtk_widget_destroy (cellview);
+
+        return GTK_TREE_MODEL (store);
+}
+
+static void
+populate_list_blaat (gpointer data)
+{
+  GtkComboBox *combo_box = GTK_COMBO_BOX (data);
+  GtkListStore *store;
+  GdkPixbuf *pixbuf;
+  GtkWidget *cellview;
+  GtkTreeIter iter;
+  
+  store = GTK_LIST_STORE (gtk_combo_box_get_model (combo_box));
+
+  gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter);
+
+  if (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter))
+    return;
+
+  cellview = gtk_cell_view_new ();
+  
+  pixbuf = gtk_widget_render_icon (cellview, GTK_STOCK_STOP,
+                                  GTK_ICON_SIZE_BUTTON, NULL);
+  gtk_list_store_append (store, &iter);                               
+  gtk_list_store_set (store, &iter,
+                     0, pixbuf,
+                     1, "gtk-stock-stop",
+                     -1);
+  
+  pixbuf = gtk_widget_render_icon (cellview, GTK_STOCK_NEW,
+                                  GTK_ICON_SIZE_BUTTON, NULL);
+  gtk_list_store_append (store, &iter);                               
+  gtk_list_store_set (store, &iter,
+                     0, pixbuf,
+                     1, "gtk-stock-new",
+                     -1);
+  
+  pixbuf = gtk_widget_render_icon (cellview, GTK_STOCK_CLEAR,
+                                  GTK_ICON_SIZE_BUTTON, NULL);
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter,
+                     0, pixbuf,
+                     1, "gtk-stock-clear",
+                     -1);
+  
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter,
+                     0, NULL,
+                     1, "separator",
+                     -1);
+  
+  pixbuf = gtk_widget_render_icon (cellview, GTK_STOCK_OPEN,
+                                  GTK_ICON_SIZE_BUTTON, NULL);
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter,
+                     0, pixbuf,
+                     1, "gtk-stock-open",
+                     -1);
+  
+  gtk_widget_destroy (cellview);  
+}
+
 static GtkTreeModel *
 create_list_blaat (void)
 {
@@ -998,6 +1082,51 @@ main (int argc, char **argv)
                                                
         gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0);
 
+        /* GtkComboBox dynamic list */
+        tmp = gtk_frame_new ("GtkComboBox (dynamic list)");
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+
+        boom = gtk_vbox_new (FALSE, 0);
+        gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
+        gtk_container_add (GTK_CONTAINER (tmp), boom);
+
+        model = create_empty_list_blaat ();
+        combobox = gtk_combo_box_new_with_model (model);
+       g_signal_connect (combobox, "popup-show", 
+                         G_CALLBACK (populate_list_blaat), combobox);
+
+       gtk_combo_box_set_add_tearoffs (GTK_COMBO_BOX (combobox), TRUE);
+        g_object_unref (model);
+        gtk_container_add (GTK_CONTAINER (boom), combobox);
+
+        renderer = gtk_cell_renderer_pixbuf_new ();
+        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox),
+                                    renderer,
+                                    FALSE);
+        gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combobox), renderer,
+                                        "pixbuf", 0,
+                                        NULL);
+       gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combobox),
+                                           renderer,
+                                           set_sensitive,
+                                           NULL, NULL);
+
+        renderer = gtk_cell_renderer_text_new ();
+        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox),
+                                    renderer,
+                                    TRUE);
+        gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combobox), renderer,
+                                        "text", 1,
+                                        NULL);
+       gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combobox),
+                                           renderer,
+                                           set_sensitive,
+                                           NULL, NULL);
+       gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combobox), 
+                                             is_separator, NULL, NULL);
+                                               
+        gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0);
+
         /* GtkComboBox custom entry */
         tmp = gtk_frame_new ("GtkComboBox (custom)");
         gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
@@ -1162,7 +1291,7 @@ main (int argc, char **argv)
         gtk_container_add (GTK_CONTAINER (tmp), boom);
 
         model = create_capital_tree ();
-        combobox = gtk_combo_box_new_with_model (model);
+       combobox = gtk_combo_box_new_with_model (model);
        gtk_combo_box_set_add_tearoffs (GTK_COMBO_BOX (combobox), TRUE);
         g_object_unref (model);
         gtk_container_add (GTK_CONTAINER (boom), combobox);